home *** CD-ROM | disk | FTP | other *** search
/ Amiga Tools 3 / Amiga Tools 3.iso / grafik / raytracing / rayshade-4.0.6.3 / fixes / fix024 / libshade / viewing.c.diff < prev    next >
Encoding:
Text File  |  1994-08-09  |  2.0 KB  |  72 lines
  1. *** viewing.c    Mon Oct 11 14:59:56 1993
  2. --- viewing.c.frac    Mon Oct 11 14:46:03 1993
  3. ***************
  4. *** 249,255 ****
  5.   Pixel *color;        /* resulting color */
  6.   int sample;        /* sample number */
  7.   {
  8. !     Float dist;
  9.       HitList hitlist;
  10.       Color ctmp, fullintens;
  11.       extern void focus_blur_ray(), ShadeRay();
  12. --- 249,255 ----
  13.   Pixel *color;        /* resulting color */
  14.   int sample;        /* sample number */
  15.   {
  16. !     Float dist, temp;
  17.       HitList hitlist;
  18.       Color ctmp, fullintens;
  19.       extern void focus_blur_ray(), ShadeRay();
  20. ***************
  21. *** 258,263 ****
  22. --- 258,264 ----
  23.        * Calculate ray direction.
  24.        */
  25.       Stats.EyeRays++;
  26. +         ray->type = EYE_RAY;
  27.       ray->dir.x = Screen.firstray.x + x*Screen.scrnx.x + y*Screen.scrny.x;
  28.       ray->dir.y = Screen.firstray.y + x*Screen.scrnx.y + y*Screen.scrny.y;
  29.       ray->dir.z = Screen.firstray.z + x*Screen.scrnx.z + y*Screen.scrny.z;
  30. ***************
  31. *** 280,285 ****
  32. --- 281,293 ----
  33.       fullintens.r = fullintens.g = fullintens.b = 1.;
  34.       dist = FAR_AWAY;
  35.       hitlist.nodes = 0;
  36. + 
  37. +         ray->viewpoint = ray->pos;
  38. +         ray->viewdist = 0.;
  39. +         ray->width = 2.*tan(deg2rad(Camera.hfov/2.))/Screen.xres;
  40. +         if ((temp = 2.*tan(deg2rad(Camera.vfov/2.))/Screen.yres) > ray->width) ray->width = temp;
  41. +         ray->stretch = 1.;
  42. + 
  43.       (void)TraceRay(ray, &hitlist, EPSILON, &dist);
  44.       ShadeRay(&hitlist, ray, dist, &Screen.background, &ctmp, &fullintens);
  45.       color->r = ctmp.r;
  46. ***************
  47. *** 291,293 ****
  48. --- 299,321 ----
  49.           color->alpha = 0.;
  50.       }
  51.   }
  52. + 
  53. + Float PixelSize(ray, dist)
  54. + Ray *ray;
  55. + Float dist;
  56. + {
  57. +         Float s, d;
  58. + 
  59. +         d = dist / ray->stretch;
  60. +         if (ray->viewdist < EPSILON)    /* eye rays */ 
  61. +                 s = ray->width * d;
  62. +         else if (ray->viewdist < FAR_AWAY)   /* infinite light sources !! */
  63. +                 s = ray->width / ray->viewdist * (d + ray->viewdist);
  64. +     else 
  65. +         s = ray->width;
  66. +         s = fabs(s);
  67. +         if (s < EPSILON) return EPSILON;
  68. + 
  69. +         return s;
  70. + }
  71. + 
  72.